# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/16 10:31:08-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# include/linux/pci_ids.h
#   2004/06/16 10:31:06-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/Makefile
#   2004/06/16 10:31:06-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/06/16 10:31:06-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/06/16 10:30:06-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# include/linux/pci_ids.h
#   2004/06/16 10:30:05-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/Makefile
#   2004/06/16 10:30:05-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/06/16 10:30:05-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#